test

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/MultipartConfig.java

@@ -27,6 +27,8 @@ public class MultipartConfig{
             tmpFile.mkdirs();
         }
         factory.setLocation(location);
+        factory.setMaxFileSize("102400KB");
+        factory.setMaxRequestSize("1024000KB");
         return factory.createMultipartConfig();
     }
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/SyCertificatesController.java

@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -64,6 +65,7 @@ public class SyCertificatesController extends JeecgController<SyCertificates, IS
 	 * @param req
 	 * @return
 	 */
+	@PermissionData(pageComponent = "system/CertificateManagement")
 	@AutoLog(value = "证件管理-分页列表查询")
 	@ApiOperation(value="证件管理-分页列表查询", notes="证件管理-分页列表查询")
 	@GetMapping(value = "/list")
@@ -72,7 +74,7 @@ public class SyCertificatesController extends JeecgController<SyCertificates, IS
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 
-		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		//syCertificates.setCreateBy(sysUser.getUsername());
 		QueryWrapper<SyCertificates> queryWrapper = QueryGenerator.initQueryWrapper(syCertificates, req.getParameterMap());
 		queryWrapper.orderByDesc("create_time");

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/entity/SyCarryB.java

@@ -86,4 +86,13 @@ public class SyCarryB implements Serializable {
 	/**备注*/
     @Excel(name = "备注", width = 15)
 	private String demo;
+	/**柜子数量*/
+	@Excel(name = "柜子数量", width = 15)
+	private Double cabinets;
+	/**总价*/
+	@Excel(name = "总价", width = 15)
+	private Double totalPrice;
+	/**原因*/
+	@Excel(name = "原因", width = 15)
+	private String reason;
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -35,6 +35,7 @@ import org.jeecg.modules.system.model.DepartIdModel;
 import org.jeecg.modules.system.model.SysUserSysDepartModel;
 import org.jeecg.modules.system.service.*;
 import org.jeecg.modules.system.util.MyThread;
+import org.jeecg.modules.system.vo.CodeVo;
 import org.jeecg.modules.system.vo.SysDepartUsersVO;
 import org.jeecg.modules.system.vo.SysUserRoleVO;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -100,10 +101,10 @@ public class SysUserController {
 		Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
 		String deptName = user.getDeptName();
         user.setDeptName(null);
-        String realname = user.getRealname();
-        user.setRealname(null);
+//        String realname = user.getRealname();
+//        user.setRealname(null);
 		QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
-		queryWrapper.like(StringUtils.isNotBlank(realname),"realname",realname);
+//		queryWrapper.like(StringUtils.isNotBlank(realname),"realname",realname);
 		Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
 		//根据公司id过滤
         LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
@@ -1469,4 +1470,19 @@ public class SysUserController {
 
         return Result.ok("OK");
     }
+
+
+    @RequestMapping(value = "/getNextNo", method = RequestMethod.GET)
+    public String getNextNo(@RequestParam(name = "name", required = true) String name) {
+        CodeVo codeVo=new CodeVo();
+        codeVo.setSeqName(name);
+        try {
+            sysUserMapper.getNextNo(codeVo);
+            return String.valueOf(codeVo.getSeqNo());
+        }catch (Exception e){
+            return "接口调用异常";
+        }
+
+    }
+
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.system.entity.SysUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.system.model.SysUserSysDepartModel;
+import org.jeecg.modules.system.vo.CodeVo;
 import org.jeecg.modules.system.vo.SysUserDepVo;
 
 import java.util.Date;
@@ -167,4 +168,5 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 	 * @return
 	 */
 	List<SysUser> getUserByRoleCode(@Param("roleCode") String roleCode,@Param("username") String username);
+	void getNextNo(CodeVo params);
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml

@@ -154,7 +154,7 @@
 		left join sys_position d on d.code = a.post
 
 		WHERE
-		a.del_flag='0' and a.communication !=1 AND c.org_code LIKE '${orgCode}%'
+		a.del_flag='0' and a.communication !=1 and ifnull(a.sy_hire_type,'1') !='离职' AND c.org_code LIKE '${orgCode}%'
 
 		<if test="userParams != null">
 			<if test="userParams.realname != null and userParams.realname != ''">
@@ -228,4 +228,9 @@
 		DELETE FROM sys_user WHERE del_flag = "1" AND id IN (${userIds})
 	</delete>
 
+	<select id="getNextNo" parameterType="org.jeecg.modules.system.vo.CodeVo"
+			statementType="CALLABLE">
+		CALL nextSeqNo(#{seqName,mode=IN},#{seqNo,mode=OUT,jdbcType=BIGINT})
+	</select>
+
 </mapper>

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/CodeVo.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.system.vo;
+
+import lombok.Data;
+
+/**
+ * 规则编码
+ */
+@Data
+public class CodeVo {
+    /**
+     * [IN]参数
+     */
+    private String seqName;
+
+    /**
+     * [OUT]序列码的值
+     */
+    private long seqNo;
+}