Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/ApplyDistrictListener.java

@@ -71,7 +71,7 @@ public class ApplyDistrictListener implements TaskListener, ExecutionListener, A
     private void create(DelegateTask delegateTask) {
         String assignee;
         Map<String, Object> kv = delegateTask.getVariables();
-        if(kv.containsKey("userId")){
+        if (kv.containsKey("userId")) {
             Long applyUserId = Long.valueOf(kv.get("userId").toString());
             SysDeptDTO deptDTO = sysDeptService.get(sysUserService.get(applyUserId).getDeptId());
 
@@ -99,7 +99,7 @@ public class ApplyDistrictListener implements TaskListener, ExecutionListener, A
                 assignee = defaultAssigneeRoleId;
             }
             logger.error("分配的用户id为:{}", assignee);
-        }else{
+        } else {
             try {
                 logger.error("流程参数异常" + JSON.toJSONString(kv));
             } catch (Exception exception) {