修改填报对象模型

src/main/java/com/keymobile/indicators/api/hytobacco/DataEnterCtrl.java

@@ -70,6 +70,7 @@ public class DataEnterCtrl {
                         List<JSONObject> orgs = systemAuthService.getOrgByNos(idList);
                         for (JSONObject jo : orgs) {
                             AuthModel authModel = new AuthModel();
+                            authModel.setObjType(Constants.OBJ_TYPE_ORG);
                             authModel.setName(jo.getString("name"));
                             authModel.setId(jo.getString("no"));
                             objs.add(authModel);

src/main/java/com/keymobile/indicators/api/hytobacco/ExcelTempCtrl.java

@@ -83,6 +83,7 @@ public class ExcelTempCtrl {
                             systemAuthService.getOrgByNos(objIds);
                     for (JSONObject jo : orgs) {
                         AuthModel authModel = new AuthModel();
+                        authModel.setObjType(Constants.OBJ_TYPE_ORG);
                         authModel.setName(jo.getString("name"));
                         authModel.setId(jo.getString("no"));
                         list.add(authModel);

src/main/java/com/keymobile/indicators/model/entity/AuthModel.java

@@ -13,17 +13,20 @@ public class AuthModel {
 
     private String name;
 
+    private int objType;
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-        AuthModel authModel = (AuthModel) o;
-        return Objects.equals(id, authModel.id) &&
-                Objects.equals(name, authModel.name);
+        AuthModel model = (AuthModel) o;
+        return objType == model.objType &&
+                Objects.equals(id, model.id) &&
+                Objects.equals(name, model.name);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, name);
+        return Objects.hash(id, name, objType);
     }
 }

src/main/java/com/keymobile/indicators/service/dataenter/impl/TaskServiceImpl.java

@@ -442,6 +442,7 @@ public class TaskServiceImpl implements TaskService {
                         List<JSONObject> list = systemAuthService.getOrgByNos(ids);
                         for (JSONObject jo : list) {
                             AuthModel model = new AuthModel();
+                            model.setObjType(Constants.OBJ_TYPE_ORG);
                             model.setId(jo.getString("no"));
                             model.setName(jo.getString("name"));
                             models.add(model);