Merge remote-tracking branch 'origin/master'

src/main/java/com/gxwebsoft/common/system/controller/UserController.java

@@ -196,7 +196,15 @@ public class UserController extends BaseController {
     public ApiResult<?> update(@RequestBody User user) {
         user.setStatus(null);
         user.setUsername(null);
-        user.setPassword(null);
+        if (user.getPassword() != null) {
+            String pwd = userService.encodePassword(user.getPassword());
+            User originData = userService.getByIdRel(user.getUserId());
+            if(!pwd.equals(originData.getPassword())) {
+                user.setPassword(pwd);
+            }else {
+                user.setPassword(null);
+            }
+        }
         if (userService.updateUser(user)) {
             return success("修改成功");
         }

src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml

@@ -29,6 +29,9 @@
             <if test="param.organizationId != null">
                 AND a.organization_id = #{param.organizationId}
             </if>
+            <if test="param.organizationIdWithChildren != null">
+                AND (a.organization_id = #{param.organizationIdWithChildren} OR a.parent_id = #{param.organizationIdWithChildren})
+            </if>
             <if test="param.parentId != null">
                 AND a.parent_id = #{param.parentId}
             </if>

src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java

@@ -133,4 +133,8 @@ public class OrganizationParam extends BaseParam {
     @TableField(exist = false)
     private String leaderUsername;
 
+    @ApiModelProperty(value = "企业及部门筛选")
+    @TableField(exist = false)
+    private Integer organizationIdWithChildren;
+
 }