修改

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/util/NumToWords.java

@@ -0,0 +1,123 @@
+package org.springblade.purchase.sales.util;
+
+public class NumToWords {
+	public static void main(String[] args) {
+		System.out.println(NumToWords.parse("192.23"));
+	}
+	//10以内的数字
+	private static final String[] SINGLE_NUM_ARR = new String[] { "", "One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine" };
+	//十几的数字
+	private static final String[] TEN_NUM_ARR = new String[] { "Ten", "Eleven", "Tweleve", "Thirteen", "Fourteen", "Fifteen", "Sixteen","Seventeen", "Eighteen", "Nineteen" };
+	//整十的数字
+	private static final String[] TEN_INTEGER_ARR = new String[] { "Ten", "Twenty", "Thirty", "Forty", "Fifty", "Sixty", "Seventy", "Eighty", "Ninety" };
+
+	public static String parse(String x) {
+		if(Double.parseDouble(x) <= 0){
+			return "Zero Cents only";
+		}
+		int z = x.indexOf("."); // 取小数点位置
+		String lstr = "", rstr = "";
+		if (z > -1) { // 看是否有小数，如果有，则分别取左边和右边
+			lstr = x.substring(0, z);
+			rstr = x.substring(z + 1);
+		} else // 否则就是全部
+			lstr = x;
+
+		String lstrrev = reverse(lstr); // 对左边的字串取反
+		String[] a = new String[5]; // 定义5个字串变量来存放解析出来的叁位一组的字串
+
+		switch (lstrrev.length() % 3) {
+			case 1:
+				lstrrev += "00";
+				break;
+			case 2:
+				lstrrev += "0";
+				break;
+		}
+		String lm = ""; // 用来存放转换後的整数部分
+		for (int i = 0; i < lstrrev.length() / 3; i++) {
+			a[i] = reverse(lstrrev.substring(3 * i, 3 * i + 3)); // 截取第一个叁位
+			if (!a[i].equals("000")) { // 用来避免这种情况：1000000 = one million
+				if (i != 0)
+					lm = transThree(a[i]) + " " + parseMore(String.valueOf(i)) + " " + lm; // 加:
+					// thousand、million、billion
+				else
+					lm = transThree(a[i]); // 防止i=0时， 在多加两个空格.
+			} else
+				lm += transThree(a[i]);
+		}
+
+		String xs = ""; // 用来存放转换後小数部分
+		if (z > -1){
+			String transTwo =  transTwo(rstr);
+			if(transTwo == null || "".equals(transTwo)){
+				xs = "";
+			}else{
+				xs = "and " + transTwo + " Cents "; // 小数部分存在时转换小数
+			}
+		}
+		return lm.trim() + " " + xs + "only";
+	}
+
+	private static String parseFirst(String s) {
+		//String[] a = new String[] { "", "One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine" };
+		return SINGLE_NUM_ARR[Integer.parseInt(s.substring(s.length() - 1))];
+	}
+
+	private static String parseTeen(String s) {
+		//String[] a = new String[] { "Ten", "Eleven", "Tweleve", "Thirteen", "Fourteen", "Fifteen", "Sixteen","Seventeen", "Eighteen", "Nineteen" };
+		return TEN_NUM_ARR[Integer.parseInt(s) - 10];
+	}
+
+	private static String parseTen(String s) {
+		//String[] a = new String[] { "Ten", "Twenty", "Thirty", "Forty", "Fifty", "Sixty", "Seventy", "Eighty", "Ninety" };
+		return TEN_INTEGER_ARR[Integer.parseInt(s.substring(0, 1)) - 1];
+	}
+
+	// 两位
+	private static String transTwo(String s) {
+		String value = "";
+		// 判断位数
+		if (s.length() > 2)
+			s = s.substring(0, 2);
+		else if (s.length() < 2)
+			s = s + "0";
+
+		if (s.startsWith("0")) // 07 - seven 是否小於10
+			value = parseFirst(s);
+		else if (s.startsWith("1")) // 17 seventeen 是否在10和20之间
+			value = parseTeen(s);
+		else if (s.endsWith("0")) // 是否在10与100之间的能被10整除的数
+			value = parseTen(s);
+		else
+			value = parseTen(s) + " " + parseFirst(s);
+		return value;
+	}
+
+	private static String parseMore(String s) {
+		String[] a = new String[] { "", "Thousand", "Million", "Billion" };
+		return a[Integer.parseInt(s)];
+	}
+
+	// 制作叁位的数
+	// s.length = 3
+	private static String transThree(String s) {
+		String value = "";
+		if (s.startsWith("0")) // 是否小於100
+			value = transTwo(s.substring(1));
+		else if (s.substring(1).equals("00")) // 是否被100整除
+			value = parseFirst(s.substring(0, 1)) + " Hundred";
+		else
+			value = parseFirst(s.substring(0, 1)) + " Hundred and " + transTwo(s.substring(1));
+		return value;
+	}
+
+	private static String reverse(String s) {
+		char[] aChr = s.toCharArray();
+		StringBuffer tmp = new StringBuffer();
+		for (int i = aChr.length - 1; i >= 0; i--) {
+			tmp.append(aChr[i]);
+		}
+		return tmp.toString();
+	}
+}

blade-service/blade-school/src/main/java/org/springblade/school/service/impl/SalaryItemServiceImpl.java

@@ -106,7 +106,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				continue;
 			}
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item == null){
 				clientMessage.setPid(id);
@@ -220,7 +220,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(employExcel,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -267,7 +267,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(positionExcel,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -314,7 +314,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(learningPower,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -361,7 +361,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(weChatExcel,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -408,7 +408,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(teacherSubsidy,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -456,7 +456,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(overtimeExcel,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -502,7 +502,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(phoneFineExcel,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -548,7 +548,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(sanitationFee,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -594,7 +594,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(attendanceExcel,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -640,7 +640,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(personalInsurance,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -686,7 +686,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(reservedFunds,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -732,7 +732,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(payTaxes,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -778,7 +778,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(postTrainExcel,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -824,7 +824,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(awardExcel,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -870,7 +870,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(vacationExcel,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -916,7 +916,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(postAllowance,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -962,7 +962,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(performanceExcel,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -1008,7 +1008,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(workloadExcel,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -1054,7 +1054,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(zhaPingExcel,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -1100,7 +1100,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(insuranceExcel,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -1165,7 +1165,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(insuranceExcel,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -1217,7 +1217,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(insuranceExcel,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -1269,7 +1269,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(insuranceExcel,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -1321,7 +1321,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(insuranceExcel,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -1372,7 +1372,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(insuranceExcel,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);
@@ -1533,7 +1533,7 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(doubleWorkloadExcel,salaryItem);
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
-			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("cname",salaryItem.getCname()).eq("tenant_id", SecureUtil.getTenantId())
+			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));
 			if (item != null){
 				salaryItem.setPid(id);