调整机构状态字典

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysOrgExtend.java

@@ -81,8 +81,8 @@ public class SysOrgExtend extends BaseEntity {
      */
     @ApiModelProperty(value = "有无保安")
 //    @JsonSerialize(using = ToStringSerializer.class)
-    private Long askari;
-    private Long businessLibrary;
+    private Integer askari;
+    private Integer businessLibrary;
 
     /**
      * 保安证
@@ -101,46 +101,46 @@ public class SysOrgExtend extends BaseEntity {
      * 值守方式
      */
     @ApiModelProperty(value = "值守方式")
-    private Long dutyMode;
+    private Integer dutyMode;
 
     /**
      * 业务库出入口远程控制
      */
     @ApiModelProperty(value = "业务库出入口远程控制")
-    private Long remoteControl;
+    private Integer remoteControl;
     /**
      * 离行式大堂设备
      */
     @ApiModelProperty(value = "离行式大堂设备")
-    private Long detachedLobbyEquipment;
+    private Integer detachedLobbyEquipment;
     /**
      * 离行式穿墙设备
      */
     @ApiModelProperty(value = "离行式穿墙设备")
-    private Long detachedWallPenetratingEquipment;
+    private Integer detachedWallPenetratingEquipment;
     /**
      * 加钞间远程控制
      */
     @ApiModelProperty(value = "加钞间远程控制")
-    private Long cashAddingRoomRemoteControl;
+    private Integer cashAddingRoomRemoteControl;
     /**
      * 是否有在行自助银行
      */
     @ApiModelProperty(value = "是否有在行自助银行")
 //    @JsonSerialize(using = ToStringSerializer.class)
-    private Long selfServiceBank;
+    private Integer selfServiceBank;
 
     /**
      * 在行式大堂设备
      */
     @ApiModelProperty(value = "在行式大堂设备")
-    private Long lobbyEquipment;
+    private Integer lobbyEquipment;
 
     /**
      * 在行式穿墙设备
      */
     @ApiModelProperty(value = "在行式穿墙设备")
-    private Long wallPenetratingEquipment;
+    private Integer wallPenetratingEquipment;
 
     /**
      * 银行物防建设id

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -483,7 +483,7 @@ public class SysUserController extends BaseController {
     public void export(SysUser user, HttpServletResponse response) {
         List<UserExport> list=null;
         //如果导出模板
-        if(user.getTemplate()){
+        if(user.getTemplate()!=null&&user.getTemplate()){
             list = new ArrayList<>();
         }else{
             list= userService.down(user);

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/dto/SysOrgExtendDto.java

@@ -46,7 +46,7 @@ public class SysOrgExtendDto  {
     @TableField(value = "name")
     private String name;
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long businessLibrary;
+    private Integer businessLibrary;
 
     @ApiModelProperty(value = "上级nh")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -108,20 +108,20 @@ public class SysOrgExtendDto  {
      * 业务库出入口远程控制
      */
     @ApiModelProperty(value = "业务库出入口远程控制")
-    private Long remoteControl;
+    private Integer remoteControl;
     /**
      * 离行式大堂设备
      */
     @ApiModelProperty(value = "离行式大堂设备")
-    private Long detachedLobbyEquipment;
+    private Integer detachedLobbyEquipment;
     /**
      * 离行式穿墙设备
      */
     @ApiModelProperty(value = "离行式穿墙设备")
-    private Long detachedWallPenetratingEquipment;
+    private Integer detachedWallPenetratingEquipment;
     /**
      * 加钞间远程控制
      */
     @ApiModelProperty(value = "加钞间远程控制")
-    private Long cashAddingRoomRemoteControl;
+    private Integer cashAddingRoomRemoteControl;
 }