Merge remote-tracking branch 'origin/dev' into dev

pz-system/src/main/java/com/pz/system/service/impl/SysUserServiceImpl.java

@@ -520,6 +520,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
                     EmployeesVo employeesVo = employeesMapper.selectVoOne(Wrappers.<Employees>lambdaQuery().eq(Employees::getUid, userId));
                     EmployeesVo employeesVo = employeesMapper.selectVoOne(Wrappers.<Employees>lambdaQuery().eq(Employees::getUid, userId));
                     if (employeesVo != null) {
                     if (employeesVo != null) {
                         userIdentityVo.setUserType(2);
                         userIdentityVo.setUserType(2);
+                        userIdentityVo.setEmCmId(employeesVo.getId());
                         userIdentityVo.setEmCmStatus(employeesVo.getStatus());
                         userIdentityVo.setEmCmStatus(employeesVo.getStatus());
                     } else {
                     } else {
                         //商家用户
                         //商家用户

pz-system/src/main/resources/mapper/system/ZyphOrderMapper.xml

@@ -68,7 +68,7 @@
                  left join user_vsitor as vsitor on vsitor.id = zyph_order.visitor
                  left join user_vsitor as vsitor on vsitor.id = zyph_order.visitor
                  left join sys_user on sys_user.user_id = vsitor.uid
                  left join sys_user on sys_user.user_id = vsitor.uid
                  left join hospital on hospital.id = zyph_order.hid
                  left join hospital on hospital.id = zyph_order.hid
-        where zyph_order.order_id = #{id}
+        where zyph_order.order_id = #{totalId}
     </select>
     </select>
 
 
     <select id="selectZyphOrderDetailDataByTotalId" resultType="com.pz.system.domain.vo.ZyphOrderItemVo">
     <select id="selectZyphOrderDetailDataByTotalId" resultType="com.pz.system.domain.vo.ZyphOrderItemVo">