傅行帆 hace 5 años
padre
commit
bc2e2eab70

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

154
 				throw new Exception("更新用户公司信息失败");
154
 				throw new Exception("更新用户公司信息失败");
155
 			}
155
 			}
156
 		}
156
 		}
157
-
157
+		
158
+		taUser.setLoginPassword(null);
158
 		if (taUserMapper.updateById(taUser) < 1) {
159
 		if (taUserMapper.updateById(taUser) < 1) {
159
 			throw new Exception("更新用户信息失败");
160
 			throw new Exception("更新用户信息失败");
160
 		}
161
 		}

+ 13
- 11
src/main/java/com/huiju/estateagents/third/controller/TaThirdPartyMiniappConfigController.java Ver fichero

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