Merge remote-tracking branch 'origin/dev_yushan' into develop

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java

@@ -159,13 +159,13 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
         } finally {
             if (entity != null){
                 sendPatrolMsg(entity.getCustomerId(),entity.getId(),SystemMessageType.PATROL_ROUTINE_WORK_ADD);
+                //网格员添加例行工作，如果是榆山街道的工作人员，需要调用【更新用户积分(双实信息更新 网格巡查)】/api/points/behavior/updateUserPoints
+                UpdateUserPointsFormDTO updateUserPointsFormDTO=new UpdateUserPointsFormDTO();
+                updateUserPointsFormDTO.setCustomerId(entity.getCustomerId());
+                updateUserPointsFormDTO.setStaffId(entity.getUserId());
+                updateUserPointsFormDTO.setBehaviorType(BehaviorTypeYuShanEnum.GRID_WORK_UPLOAD.getCode());
+                yuShanSysApiService.updateUserPoints(entity.getCustomerId(), Arrays.asList(updateUserPointsFormDTO));
             }
-            //网格员添加例行工作，如果是榆山街道的工作人员，需要调用【更新用户积分(双实信息更新 网格巡查)】/api/points/behavior/updateUserPoints
-            UpdateUserPointsFormDTO updateUserPointsFormDTO=new UpdateUserPointsFormDTO();
-            updateUserPointsFormDTO.setCustomerId(entity.getCustomerId());
-            updateUserPointsFormDTO.setStaffId(entity.getUserId());
-            updateUserPointsFormDTO.setBehaviorType(BehaviorTypeYuShanEnum.GRID_WORK_UPLOAD.getCode());
-            yuShanSysApiService.updateUserPoints(entity.getCustomerId(), Arrays.asList(updateUserPointsFormDTO));
         }
 
     }