java110 5 gadi atpakaļ
vecāks
revīzija
5c4f20d359

+ 9 - 0
java110-bean/src/main/java/com/java110/dto/repair/RepairDto.java

@@ -78,6 +78,7 @@ public class RepairDto extends PageDto implements Serializable {
     private List<PhotoVo> photos;
 
     private String returnVisitFlag;
+    private String userState;
 
 
     public String getRepairName() {
@@ -305,4 +306,12 @@ public class RepairDto extends PageDto implements Serializable {
     public void setReturnVisitFlag(String returnVisitFlag) {
         this.returnVisitFlag = returnVisitFlag;
     }
+
+    public String getUserState() {
+        return userState;
+    }
+
+    public void setUserState(String userState) {
+        this.userState = userState;
+    }
 }

+ 2 - 1
java110-db/src/main/resources/mapper/community/RepairServiceDaoImplMapper.xml

@@ -307,7 +307,8 @@
         bId,ru.pre_staff_id preStaffId,ru.pre_staff_name preStaffName,
         d.name stateName,
         rs.repair_type_name repairTypeName,rs.repair_way repairWay,
-        t.repair_obj_type,t.repair_obj_id,t.repair_obj_name,t.repair_obj_type repairObjType,t.repair_obj_id repairObjId,t.repair_obj_name repairObjName
+        t.repair_obj_type,t.repair_obj_id,t.repair_obj_name,t.repair_obj_type repairObjType,t.repair_obj_id repairObjId,t.repair_obj_name repairObjName,
+        ru.state userState
         from r_repair_pool t
         left join t_dict d on t.state = d.status_cd and d.table_name = 'r_repair_pool' and d.table_columns = 'state'
         left join r_repair_setting rs on rs.repair_type = t.repair_type and rs.status_cd = '0'

+ 1 - 0
service-api/src/main/java/com/java110/api/listener/user/UserLoginListener.java

@@ -87,6 +87,7 @@ public class UserLoginListener extends AbstractServiceApiPlusListener {
             errorInfo = "临时票据错误";
         }
 
+
         List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
 
         if (userDtos == null || userDtos.size() < 1) {