小修改

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/api/rbac/MenuController.java

@@ -21,7 +21,9 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author ChenChao
@@ -107,4 +109,14 @@ public class MenuController extends MyValidController {
         response.setSystemTypeList(systemTypeList);
         return ApiResponse.of(response);
     }
+
+    @ApiOperation(value = "获取所有的系统类型2")
+    @PostMapping(value = "/systemTypeMap")
+    public ApiResponse<Map<String, String>> systemTypeMap() {
+        Map<String, String> map = new HashMap<>();
+        for (SystemType value : SystemType.values()) {
+            map.put(value.name(),value.getName());
+        }
+        return ApiResponse.of(map);
+    }
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/system/ChangePasswordRequestDTO.java

@@ -0,0 +1,26 @@
+package cn.com.taiji.userw.dto.system;
+
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@Accessors(chain = true)
+@ApiModel(description = "员工只用新密码修改密码")
+public class ChangePasswordRequestDTO extends AbstractStaffBizRequestDTO {
+
+    /** 新密码*/
+    @ApiModelProperty(value = "新密码")
+    @NotBlank(message = "新密码不能为空")
+    private String newPassword;
+    /** 确认新密码*/
+    @ApiModelProperty(value = "确认新密码")
+    @NotBlank(message = "确认新密码不能为空")
+    private String affirmNewPassword;
+}

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/wx/WxSignChannelConfigManagerImpl.java

@@ -49,9 +49,9 @@ public class WxSignChannelConfigManagerImpl extends AbstractManager implements W
     @Override
     public void add(WxCarAddReqDTO reqDto) throws ManagerException {
         reqDto.validate();
-        CommonWxSignConfig byAgencyId = commonWxSignConfigRepo.findByAgencyId(reqDto.getAgencyId());
+        CommonWxSignConfig byAgencyId = commonWxSignConfigRepo.findByAgencyIdAndVersion(reqDto.getAgencyId(),reqDto.getVersion());
         if(byAgencyId != null){
-            throw new ManagerException("该渠道已配置");
+            throw new ManagerException("该渠道版本已配置");
         }
         CommonWxSignConfig config = copyProperties(reqDto, new CommonWxSignConfig());
         commonWxSignConfigRepo.persist(config);