兼容mssql

pom.xml

@@ -24,7 +24,7 @@
         <httpclient.version>4.5.7</httpclient.version>
         <commons-httpclient.version>3.1</commons-httpclient.version>
         <fastjson.version>1.2.49</fastjson.version>
-        <mybatis-plus.version>3.4.1</mybatis-plus.version>
+        <mybatis-plus.version>3.5.2</mybatis-plus.version>
         <skipTests>true</skipTests>
         <wx.java.version>4.2.0</wx.java.version>
     </properties>
@@ -109,7 +109,7 @@
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.4.5</version>
+            <version>1.4.4</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.mybatis</groupId>

src/main/java/com/qs/serve/common/util/WarpUtil.java

@@ -40,11 +40,11 @@ public class WarpUtil extends AnnotationQueryStorage {
             String orderType = ServletUtils.getParameter(ORDER_TYPE_NAME);
             if(StringUtils.isNotEmpty(columnsString)){
                 String[] columns = columnsString.split(",");
-                if(orderType.equals(ORDER_DESC)){
+//                if(orderType.equals(ORDER_DESC)){
-                    queryWrapper.orderByDesc(columns);
+//                    queryWrapper.orderByDesc(columns);
-                }else {
+//                }else {
-                    queryWrapper.orderByAsc(columns);
+//                    queryWrapper.orderByAsc(columns);
-                }
+//                }
             }
         }
         return queryWrapper;

src/main/java/com/qs/serve/controller/AdminPortalController.java

@@ -95,8 +95,8 @@ public class AdminPortalController {
     public R<?> phoneCode(@PathVariable("phone") String phone){
         LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(SysUser::getAccount,phone);
-        int count = sysUserService.count(wrapper);
+        Long count = sysUserService.count(wrapper);
-        if(count<1){
+        if(count<1L){
             return R.error("无效手机号，请重新输入");
         }
         String key = RedisCacheKeys.PHONE_KEY+phone;

src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java

@@ -144,8 +144,16 @@ public class QmsGroupController {
         }
         qmsGroup.setPublishState(1);
         qmsGroup.setPublishTime(LocalDateTime.now());
+        try {
             qmsGroupService.updateById(qmsGroup);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        try {
             this.qmsGroupScopeService.publish(groupId);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         return R.ok();
     }
 
@@ -234,8 +242,16 @@ public class QmsGroupController {
         qmsGroup.setFormContext(qmsForm.getFormContext());
         qmsGroup.setVersion(qmsForm.getVersion());
         qmsGroup.setPublishState(0);
+        try {
             qmsGroupService.save(qmsGroup);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        try {
             qmsGroupScopeService.saveByBo(qmsGroup.getId(),param);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         return R.ok();
     }
 

src/main/java/com/qs/serve/modules/qms/entity/QmsGroup.java

@@ -12,6 +12,7 @@ import com.qs.serve.common.model.dto.SimpleKeyValue;
 import com.qs.serve.modules.sys.entity.SysDept;
 import com.qs.serve.modules.sys.entity.dto.SysUserSimpleVo;
 import lombok.Data;
+import org.apache.ibatis.annotations.Options;
 import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -49,7 +50,6 @@ public class QmsGroup implements Serializable {
 
     /** 表单json */
     @NotBlank(message = "表单json不能为空")
-    @Length(max = 0,message = "表单json长度不能超过0字")
     private String formContext;
 
     /** 发布状态 */

src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

@@ -82,8 +82,6 @@ public class SysUserController {
         sysUser.setAuthorList(loginUser.getAuthorList());
         sysUserService.relateInfo(sysUser);
         sysUser.setPassword(null);
-        List<WxUser> wxUserList = wxUserService.getBySysUserId(sysUser.getId());
-        sysUser.setWxUserInfoList(wxUserList);
         return R.ok(sysUser);
     }
 
@@ -247,6 +245,8 @@ public class SysUserController {
         }
         sysUser.setPassword(null);
         sysUserService.relateInfo(sysUser);
+        List<WxUser> wxUserList = wxUserService.getBySysUserId(sysUser.getId());
+        sysUser.setWxUserInfoList(wxUserList);
         return R.ok(sysUser);
     }
 
@@ -266,8 +266,8 @@ public class SysUserController {
         //检查手机号是否已用
         LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(SysUser::getMobile,param.getMobile());
-        int count = sysUserService.count(wrapper);
+        Long count = sysUserService.count(wrapper);
-        if(count>0){
+        if(count>0L){
             return R.error("手机号已被注册");
         }
         param.setAccount(param.getMobile());

src/main/java/com/qs/serve/modules/sys/service/impl/SysRoleServiceImpl.java

@@ -71,7 +71,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         roleWrap.in(SysRole::getId,roleIds);
         roleWrap.eq(SysRole::getEnable,1);
         roleWrap.eq(SysRole::getUserVisible,1);
-        int count = baseMapper.selectCount(roleWrap);
+        int count = baseMapper.selectCount(roleWrap).intValue();
         if(count!=roleIds.size()){
             Assert.throwEx("数据不配");
         }

src/main/java/com/qs/serve/modules/wx/api/WxSvcUserApi.java

@@ -57,8 +57,8 @@ public class WxSvcUserApi {
         //拦截未注册的手机号
         LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
         lqw.eq(SysUser::getMobile,phone);
-        int count = sysUserService.count(lqw);
+        Long count = sysUserService.count(lqw);
-        if(count<1){
+        if(count<1L){
             return R.error("手机号未被收录");
         }
         String key = RedisCacheKeys.PHONE_KEY+phone;

src/main/java/com/qs/serve/modules/wx/controller/WxUserController.java

@@ -45,6 +45,9 @@ public class WxUserController {
         LambdaQueryWrapper<WxUser> lqw = new LambdaQueryWrapper<>(param);
         if(param.getNotBindFlag()!=null&&param.getNotBindFlag().equals(1)){
             lqw.isNull(WxUser::getPhone).or().eq(WxUser::getPhone,"");
+        }else if (param.getNotBindFlag()!=null&&param.getNotBindFlag().equals(0)){
+            lqw.isNotNull(WxUser::getPhone);
+            lqw.ne(WxUser::getPhone,"");
         }
         List<WxUser> list = wxUserService.list(lqw);
         return R.byPageHelperList(list);