Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/api/controller/auth/AuthUserController.java

@@ -12,6 +12,7 @@ import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.service.auth.*;
+import com.glxp.api.util.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -130,6 +131,12 @@ public class AuthUserController extends BaseController {
     public BaseResponse updateUser(@RequestBody UpdateUserRequset updateUserRequset) {
         AuthAdmin authAdmin=customerService.getUserBean();
         System.out.println(updateUserRequset.toString());
+        if (StringUtils.isBlank(updateUserRequset.getNewPassword())){
+            return ResultVOUtils.error(500,"请输入新密码！");
+        }
+        if (StringUtils.isBlank(updateUserRequset.getConfirmPassword())){
+            return ResultVOUtils.error(500,"请输入确认密码！");
+        }
         if (!updateUserRequset.getPassWord().equals(authAdmin.getPassWord())){
             return ResultVOUtils.error(500,"当前密码输入错误！请重新输入！");
         }

src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java

@@ -751,8 +751,8 @@ public class SpsSyncDownloadController {
                     }
                 } else {
 //                    更新业务详情
-                    if (orderEntity.getCheckStatus() != null)
+//                    if (orderEntity.getCheckStatus() != null)
-                        orderService.update(orderEntity);
+//                        orderService.update(orderEntity);
                     //更新业务详情
                     if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailBizEntities())) {
                         List<IoOrderDetailBizEntity> orderDetailBizEntities = syncDataResponse.getOrderDetailBizEntities();

src/main/java/com/glxp/api/req/auth/FilterAuthUserRequest.java

@@ -11,6 +11,7 @@ import java.util.List;
 public class FilterAuthUserRequest extends ListPageRequest {
 
     private String userName;
+    private String deptName;
 
     private Integer userFlag;
 

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -585,8 +585,14 @@ public class IoOrderServiceImpl implements IoOrderService {
                 IoOrderResponse response = new IoOrderResponse();
                 BeanUtil.copyProperties(orderEntity, response);
                 if (orderEntity.getStatus().equals(ConstantStatus.ORDER_STATUS_AUDITED) && checkBusTypeSupplementOrder(orderEntity)
-                        && StrUtil.isEmpty(orderEntity.getSupplementNo())) {
+                        && StrUtil.isEmpty(orderEntity.getSupplementNo())
-                    response.setEnableSupplementOrder(true);
+                ) {
+                    if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP) {
+                        if (orderEntity.getOutChangeEnable()) {
+                            response.setEnableSupplementOrder(true);
+                        }
+                    } else
+                        response.setEnableSupplementOrder(true);
                 }
                 result.add(response);
             } catch (Exception e) {

src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml

@@ -21,6 +21,9 @@
             <if test="userName != null and '' != userName">
                 AND userName LIKE CONCAT('%', #{userName}, '%')
             </if>
+            <if test="deptName != null and '' != deptName">
+                AND auth_dept.name LIKE CONCAT('%', #{deptName}, '%')
+            </if>
             <if test="neUserName != null and '' != neUserName">
                 AND userName != #{neUserName}
             </if>