Merge branch 'han' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionPlanServiceImpl.java

@@ -655,14 +655,14 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
             patrolInspectionSiteVo.setSiteName(patrolInspectionSiteList.get(i).getSiteName());
             patrolInspectionSiteVo.setAreaId(patrolInspectionSiteList.get(i).getAreaId());
             for (int j = 0; j < PatrolInspectionAreaList.size(); j++) {
-                if (patrolInspectionSiteList.get(i).getAreaId() == PatrolInspectionAreaList.get(j).getId()) {
+                if (patrolInspectionSiteList.get(i).getAreaId().equals(PatrolInspectionAreaList.get(j).getId())) {
                     patrolInspectionSiteVo.setAreaName(PatrolInspectionAreaList.get(j).getAreaName());
                 }
             }
             patrolInspectionSiteVo.setId(patrolInspectionSiteList.get(i).getId());
             patrolInspectionSiteVo.setSiteStatus(false);
             for (int j = 0; j < planSiteList.size(); j++) {
-                if (patrolInspectionSiteList.get(i).getId() == planSiteList.get(j).getSiteId()) {
+                if (patrolInspectionSiteList.get(i).getId().equals(planSiteList.get(j).getSiteId())) {
                     patrolInspectionSiteVo.setSiteStatus(true);
                 }
             }

service-issue/service-issue-biz/src/main/java/com/usky/issue/annotation/CheckSign.java

@@ -0,0 +1,2 @@
+package com.usky.issue.annotation;public @interface CheckSign {
+}

service-issue/service-issue-biz/src/main/java/com/usky/issue/annotation/CheckSignAspect.java

@@ -0,0 +1,2 @@
+package com.usky.issue.annotation;public class CheckSignAspect {
+}

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/util/SignUtil.java

@@ -0,0 +1,2 @@
+package com.usky.issue.service.util;public class SignUtil {
+}