Przeglądaj źródła

修改密码 加入演示环境判断

java110 3 lat temu
rodzic
commit
4e124bbb3e

+ 1 - 1
java110-bean/src/main/java/com/java110/po/resourceStoreUseRecord/ResourceStoreUseRecordPo.java

@@ -19,7 +19,7 @@ public class ResourceStoreUseRecordPo implements Serializable {
     //1001 报废回收   2002 工单损耗   3003 公用损耗
     private String state;
 
-    private String statusCd;
+    private String statusCd = "0";
 
     public String getRepairId() {
         return repairId;

+ 3 - 0
service-store/src/main/java/com/java110/store/cmd/resourceStore/ListUserStorehousesCmd.java

@@ -42,6 +42,9 @@ public class ListUserStorehousesCmd extends Cmd {
         UserStorehouseDto userStorehouseDto = BeanConvertUtil.covertBean(reqJson, UserStorehouseDto.class);
         //获取用户id
         String userId = reqJson.getString("userId");
+        if(StringUtil.isEmpty(userId)){
+            userId = context.getReqHeaders().get("user-id");
+        }
         List<Map> privileges = null;
         //查看所有个人物品权限
         BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();

+ 3 - 0
service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveAllocationUserStorehouseCmd.java

@@ -65,6 +65,9 @@ public class SaveAllocationUserStorehouseCmd extends Cmd {
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
         String userId = reqJson.getString("userId");
+        if(StringUtil.isEmpty(userId)){
+            userId = context.getReqHeaders().get("user-id");
+        }
         UserDto userDto = new UserDto();
         userDto.setUserId(userId);
         userDto.setPage(1);

+ 2 - 1
service-user/src/main/java/com/java110/user/cmd/user/ChangeStaffPwdCmd.java

@@ -3,6 +3,7 @@ package com.java110.user.cmd.user;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.context.DataFlowContext;
+import com.java110.core.context.Environment;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -28,7 +29,7 @@ public class ChangeStaffPwdCmd extends Cmd {
     private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
-
+        Environment.isDevEnv();
     }
 
     @Override