傅行帆 5 years ago
parent
commit
bc2e2eab70

+ 2
- 1
src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java View File

@@ -154,7 +154,8 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
154 154
 				throw new Exception("更新用户公司信息失败");
155 155
 			}
156 156
 		}
157
-
157
+		
158
+		taUser.setLoginPassword(null);
158 159
 		if (taUserMapper.updateById(taUser) < 1) {
159 160
 			throw new Exception("更新用户信息失败");
160 161
 		}

+ 13
- 11
src/main/java/com/huiju/estateagents/third/controller/TaThirdPartyMiniappConfigController.java View File

@@ -18,6 +18,8 @@ import org.springframework.web.bind.annotation.RequestParam;
18 18
 import org.springframework.web.bind.annotation.ResponseBody;
19 19
 import org.springframework.web.bind.annotation.RestController;
20 20
 
21
+import javax.servlet.http.HttpServletRequest;
22
+
21 23
 /**
22 24
  * <p>
23 25
     *   前端控制器
@@ -27,7 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
27 29
  * @since 2019-10-17
28 30
  */
29 31
 @RestController
30
-@RequestMapping("/")
32
+@RequestMapping("/api")
31 33
 public class TaThirdPartyMiniappConfigController extends BaseController {
32 34
 
33 35
     private final Logger logger = LoggerFactory.getLogger(TaThirdPartyMiniappConfigController.class);
@@ -42,15 +44,16 @@ public class TaThirdPartyMiniappConfigController extends BaseController {
42 44
      * @param pageSize
43 45
      * @return
44 46
      */
45
-    @RequestMapping(value="/taThirdPartyMiniappConfig",method= RequestMethod.GET)
47
+    @RequestMapping(value="/admin/thirdPartyMiniapp",method= RequestMethod.GET)
46 48
     public ResponseBean taThirdPartyMiniappConfigList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
47
-                                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
49
+                                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
50
+                                                      HttpServletRequest request){
48 51
         ResponseBean responseBean = new ResponseBean();
49 52
         try {
50 53
             //使用分页插件
51 54
 		    IPage<TaThirdPartyMiniappConfig> pg = new Page<>(pageNum, pageSize);
52 55
             QueryWrapper<TaThirdPartyMiniappConfig> queryWrapper = new QueryWrapper<>();
53
-            queryWrapper.orderByDesc("create_date");
56
+            queryWrapper.eq("org_id", getOrgId(request));
54 57
 
55 58
             IPage<TaThirdPartyMiniappConfig> result = iTaThirdPartyMiniappConfigService.page(pg, queryWrapper);
56 59
             responseBean.addSuccess(result);
@@ -67,10 +70,11 @@ public class TaThirdPartyMiniappConfigController extends BaseController {
67 70
      * @param taThirdPartyMiniappConfig 实体对象
68 71
      * @return
69 72
      */
70
-    @RequestMapping(value="/taThirdPartyMiniappConfig",method= RequestMethod.POST)
71
-    public ResponseBean taThirdPartyMiniappConfigAdd(@RequestBody TaThirdPartyMiniappConfig taThirdPartyMiniappConfig){
73
+    @RequestMapping(value="/admin/thirdPartyMiniapp/add",method= RequestMethod.POST)
74
+    public ResponseBean taThirdPartyMiniappConfigAdd(@RequestBody TaThirdPartyMiniappConfig taThirdPartyMiniappConfig,HttpServletRequest request){
72 75
         ResponseBean responseBean = new ResponseBean();
73 76
         try {
77
+            taThirdPartyMiniappConfig.setOrgId(getOrgId(request));
74 78
             if (iTaThirdPartyMiniappConfigService.save(taThirdPartyMiniappConfig)){
75 79
                 responseBean.addSuccess(taThirdPartyMiniappConfig);
76 80
             }else {
@@ -108,13 +112,11 @@ public class TaThirdPartyMiniappConfigController extends BaseController {
108 112
 
109 113
     /**
110 114
      * 修改对象
111
-     * @param id  实体ID
112 115
      * @param taThirdPartyMiniappConfig 实体对象
113 116
      * @return
114 117
      */
115
-    @RequestMapping(value="/taThirdPartyMiniappConfig/{id}",method= RequestMethod.PUT)
116
-    public ResponseBean taThirdPartyMiniappConfigUpdate(@PathVariable Integer id,
117
-                                        @RequestBody TaThirdPartyMiniappConfig taThirdPartyMiniappConfig){
118
+    @RequestMapping(value="/admin/thirdPartyMiniapp/update",method= RequestMethod.PUT)
119
+    public ResponseBean taThirdPartyMiniappConfigUpdate(@RequestBody TaThirdPartyMiniappConfig taThirdPartyMiniappConfig){
118 120
         ResponseBean responseBean = new ResponseBean();
119 121
         try {
120 122
             if (iTaThirdPartyMiniappConfigService.updateById(taThirdPartyMiniappConfig)){
@@ -134,7 +136,7 @@ public class TaThirdPartyMiniappConfigController extends BaseController {
134 136
      * 根据id查询对象
135 137
      * @param id  实体ID
136 138
      */
137
-    @RequestMapping(value="/taThirdPartyMiniappConfig/{id}",method= RequestMethod.GET)
139
+    @RequestMapping(value="/admin/thirdPartyMiniapp/{id}",method= RequestMethod.GET)
138 140
     public ResponseBean taThirdPartyMiniappConfigGet(@PathVariable Integer id){
139 141
         ResponseBean responseBean = new ResponseBean();
140 142
         try {